Misc cleanups.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 27a18276bfd4fec3ca007aa4a0dbb514f3169db7..878c42788aabab71a59257a2f848ec30c25401bb 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -191,7 +191,7 @@ void waypt_del (waypoint *);
 void waypt_free (waypoint *);
 void waypt_disp_all(waypt_cb);
 void waypt_flush(queue *);
-void waypt_flush_all();
+void waypt_flush_all(void);
 unsigned int waypt_count(void);
 void free_gpx_extras (xml_tag * tag);
 void xcsv_read_internal_style(const char *style_buf);
@@ -204,7 +204,7 @@ void route_add_head(route_head *rte);
 void route_disp_all(route_hdr, route_trl, waypt_cb);
 void route_free (route_head *);
 void route_flush( queue *);
-void route_flush_all();
+void route_flush_all(void);
 unsigned int route_waypt_count(void);
 unsigned int route_count(void);
 

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index e32e5ce599242fc1415ce29aae27336aa39a6de8..07d4cdea63d078fc70d95b0afcbfd9d256c908a6 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -177,7 +177,7 @@ pid_to_model_t pid_to_model[] =
        { mm_meridian, 43, "Meridian Marine" },
        { mm_sportrak, 44, "Sportrak Topo" },
        { mm_sportrak, 45, "Mystic" },
-       { mm_merdian, 46, "MobileMapper" },
+       { mm_meridian, 46, "MobileMapper" },
        { mm_unknown, 0, NULL }
 };
 

diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index 27a6ef470f65df5c8ee113b0d8a37723b29a97c3..306424330de42accca0a56702cde1bb1176ac677 100644 (file)
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -23,7 +23,7 @@
 
 global_options global_opts;
 
-void
+static void
 usage(const char *pname)
 {
        printf("GPSBabel Version %s.  http://gpsbabel.sourceforge.net\n\n",